From 92d3af0d61ad4281327858a3a03a23a5f46c3c8d Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Tue, 25 Jul 2017 14:09:49 +0200 Subject: [PATCH] Update patches --- debian/patches/disable-net-tests.patch | 2 +- debian/patches/use-system-libgit2.patch | 10 ++-------- debian/rules | 1 + 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch index 8f6e8c10b..f69e646f8 100644 --- a/debian/patches/disable-net-tests.patch +++ b/debian/patches/disable-net-tests.patch @@ -45,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ .file("Cargo.toml", r#" --- a/tests/test.rs +++ b/tests/test.rs -@@ -2265,7 +2265,7 @@ +@@ -2194,7 +2194,7 @@ execs().with_status(0)); } diff --git a/debian/patches/use-system-libgit2.patch b/debian/patches/use-system-libgit2.patch index 35f6d0018..7169d3f67 100644 --- a/debian/patches/use-system-libgit2.patch +++ b/debian/patches/use-system-libgit2.patch @@ -3,8 +3,8 @@ Author: Ximin Luo Forwarded: not-needed --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/vendor/libgit2-sys-0.6.6/build.rs -+++ b/vendor/libgit2-sys-0.6.6/build.rs +--- a/vendor/libgit2-sys-0.6.12/build.rs ++++ b/vendor/libgit2-sys-0.6.12/build.rs @@ -31,10 +31,8 @@ } let has_pkgconfig = Command::new("pkg-config").output().is_ok(); @@ -18,9 +18,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } if !Path::new("libgit2/.git").exists() { ---- a/vendor/libgit2-sys-0.6.6/.cargo-checksum.json -+++ b/vendor/libgit2-sys-0.6.6/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"32f1614473508047c68a95977074c32a41fafb7f08b26f9d5dd937576ecc594f","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"} -\ No newline at end of file -+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"1716bfaf32d1c020e8f4a9220f28d8158feac531408dfc1f66eefae21f3744f4","build.rs":"7006deca0e11974227326174088500df8f7d1708839378edfd242a11ed7f18c9","lib.rs":"427ae51eeab835af5bd1fc26f9b2eaad1f9fd58671ec080eb9def921dcfe2420"},"package":"c7a4e33e9f8b8883c1a5898e72cdc63c00c4f2265283651533b00373094e901c"} diff --git a/debian/rules b/debian/rules index e7a901ecf..c1ef37d44 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,7 @@ ifneq ($(filter pkg.cargo.mkstage0,$(DEB_BUILD_PROFILES)),) else ln -s `which cargo` $(CURDIR)/cargo-stage0 endif + debian/scripts/prune-checksums vendor/libgit2-sys-*/ # Configure to build cargo using the just-built stage0 ./configure \ --prefix=/usr \ -- 2.30.2